bitkeeper revision 1.1132.1.1 (410fc148tLJQNH7768Degg248R1WlQ)

Add a 'verbose' compile option to Xen that gets us tracing without
stress tests or assertions that come with the 'debug' option.

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 6073e113c20fc8df270685764b9ee73e4894414a..92811bae9ce052ae2d19d81f7bf930819ed73894 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -40,6 +40,11 @@ include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
 
 ifneq ($(debug),y)
 CFLAGS += -DNDEBUG
+ifeq ($(verbose),y)
+CFLAGS += -DVERBOSE
+endif
+else
+CFLAGS += -DVERBOSE
 endif
 
 ifeq ($(debugger),y)

diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 5fe9df180ddc3d28fc0755bc6fd1c8c20e1684b2..8e172ae935f06f21a787e7ade39c41bfa25e3d84 100644 (file)
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -808,7 +808,7 @@ void __init UNEXPECTED_IO_APIC(void)
 
 void __init print_IO_APIC(void)
 {
-#ifndef NDEBUG
+#ifdef VERBOSE
        int apic, i;
        struct IO_APIC_reg_00 reg_00;
        struct IO_APIC_reg_01 reg_01;

diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c
index f2cd500809687ba9817627da03e6d797a75f2273..340b3e83235159940cc5af458ef51ed2977c4a6f 100644 (file)
--- a/xen/arch/x86/memory.c
+++ b/xen/arch/x86/memory.c
@@ -100,7 +100,7 @@
 #include <asm/domain_page.h>
 #include <asm/ldt.h>
 
-#ifndef NDEBUG
+#ifdef VERBOSE
 #define MEM_LOG(_f, _a...)                           \
   printk("DOM%u: (file=memory.c, line=%d) " _f "\n", \
          current->domain , __LINE__ , ## _a )
@@ -1250,7 +1250,7 @@ ptwr_info_t ptwr_info[NR_CPUS] =
       }
     };
 
-#ifndef NDEBUG
+#ifdef VERBOSE
 int ptwr_debug = 0;
 #define PTWR_PRINTK(x) if (ptwr_debug) printk x
 #else

diff --git a/xen/common/physdev.c b/xen/common/physdev.c
index a3852f48507fe3b6d93546e27af9a24eb71bce39..e76b72b56f9aa76fb791048e616bff597ecd9b1f 100644 (file)
--- a/xen/common/physdev.c
+++ b/xen/common/physdev.c
@@ -38,7 +38,7 @@ extern void pcibios_enable_irq(struct pci_dev *dev);
 #define VERBOSE_INFO(_f, _a...) ((void)0)
 #endif
 
-#ifndef NDEBUG
+#ifdef VERBOSE
 #define INFO(_f, _a...) printk( _f, ## _a )
 #else
 #define INFO(_f, _a...) ((void)0)

diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
index 4ef230854fb82b74f4adee3e529adfc216a86b7b..cbfca412b7bedc7f77de3d3e1470f2b7a4f4f9d2 100644 (file)
--- a/xen/include/asm-x86/shadow.h
+++ b/xen/include/asm-x86/shadow.h
@@ -60,7 +60,7 @@ struct shadow_status {
 #define shadow_ht_extra_size         128 /*128*/
 #define shadow_ht_buckets            256 /*256*/
 
-#ifndef NDEBUG
+#ifdef VERBOSE
 #define SH_LOG(_f, _a...)                             \
 printk("DOM%u: (file=shadow.c, line=%d) " _f "\n",    \
        current->domain , __LINE__ , ## _a )

diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h
index fb0a7d391fec02e4ff3d6113825549f3d92d8caa..74d7c3b1b4bf134af3e8ed02e855759ec9507dce 100644 (file)
--- a/xen/include/xen/config.h
+++ b/xen/include/xen/config.h
@@ -31,7 +31,7 @@
 
 #define capable(_c) 0
 
-#ifndef NDEBUG
+#ifdef VERBOSE
 #define DPRINTK(_f, _a...) printk("(file=%s, line=%d) " _f, \
                            __FILE__ , __LINE__ , ## _a )
 #else